From fdae613b145be2c9e73f2db95e1bd3867314330e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 21 Mar 2013 15:29:16 -0400 Subject: [PATCH] messageTray: Take modal grabs for the context menu and notification boxpointer As the context menu and notification boxpointer can only appear if we already take a modal grab, grabFocus will have problematic results if the focus does somehow change. https://bugzilla.gnome.org/show_bug.cgi?id=698483 --- js/ui/messageTray.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js index 70ff6d2d1..c9e64e7f8 100644 --- a/js/ui/messageTray.js +++ b/js/ui/messageTray.js @@ -1748,7 +1748,7 @@ const MessageTray = new Lang.Class({ let [x, y, mask] = global.get_pointer(); this._contextMenu.setPosition(Math.round(x), Math.round(y)); this._grabHelper.grab({ actor: this._contextMenu.actor, - grabFocus: true, + modal: true, onUngrab: Lang.bind(this, function () { this._contextMenu.close(BoxPointer.PopupAnimation.FULL); }) @@ -2661,7 +2661,7 @@ const MessageTray = new Lang.Class({ } this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child, - grabFocus: true, + modal: true, onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) }); this._summaryBoxPointer.actor.opacity = 0; -- 2.39.5